x11: Avoid gdk_device_manager_get_client_pointer()

We can use the pointer of the default seat instead.

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 9483bc03ddae8e95312eb98855766c9a69298684..eff9f931ed44035929b33203d4db1e094793e3a5 100644 (file)
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -1364,7 +1364,7 @@ gdk_x11_display_init_input (GdkDisplay *display)
 
   g_list_free (list);
 
-  display->core_pointer = gdk_device_manager_get_client_pointer (device_manager);
+  display->core_pointer = gdk_seat_get_pointer (gdk_display_get_default_seat (display));
   display_x11->input_devices = g_list_prepend (display_x11->input_devices,
                                                g_object_ref (display->core_pointer));
 }

diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index d634cf6a3702e289102feb15e32f4676bb30e73a..6bc87c43c23bc5f6bed353bf2553efb81d3d4272 100644 (file)
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -1597,12 +1597,12 @@ xdnd_enter_filter (GdkXEvent *xev,
                    GdkEvent  *event,
                    gpointer   cb_data)
 {
-  GdkDeviceManager *device_manager;
   GdkDisplay *display;
   GdkX11Display *display_x11;
   XEvent *xevent = (XEvent *)xev;
   GdkDragContext *context;
   GdkX11DragContext *context_x11;
+  GdkSeat *seat;
   gint i;
   Atom type;
   int format;
@@ -1650,8 +1650,8 @@ xdnd_enter_filter (GdkXEvent *xev,
   context_x11->version = version;
 
   /* FIXME: Should extend DnD protocol to have device info */
-  device_manager = gdk_display_get_device_manager (display);
-  gdk_drag_context_set_device (context, gdk_device_manager_get_client_pointer (device_manager));
+  seat = gdk_display_get_default_seat (display);
+  gdk_drag_context_set_device (context, gdk_seat_get_pointer (seat));
 
   context->source_window = gdk_x11_window_foreign_new_for_display (display, source_window);
   if (!context->source_window)